Revert 52dbbcd..370ec4b

This rolls back to commit 52dbbcd74b4292a26eaef2370dcb85ddb094781b.