This reverts commit 998bf92d, reversing
changes made to 788ddf58.