This reverts commit 13984608. A problem was reported - the attribution seems slightly questionable, but this is low enough value after 297e06cf that reverting is easy.
