Revert 242e4dd..50658ee

This rolls back to commit 242e4dd483611f0e25be10d8a7793251e5a3c766.