This reverts commit 796027f2, reversing
changes made to bca30ed2.

Preemptive revert before further testing has been done.