This reverts commit 60b5a82, reversing
changes made to 0cfc573.