Revert 00b1eeb..979dda0

This rolls back to commit 00b1eebd64e3599f1ec09c11fcd0580e4bf9f660.