Revert 1383f87..53555af

This rolls back to commit 1383f876f315d9477d4d5175c5ffa3b3f4b9d4ba.