Revert 2738688..10d49a8

This rolls back to commit 273868866be0b6a66924f677002c57f3ef55932a.