This reverts commit 73804271. A second, apparently separate, issue has been reported on the original review.