Revert 396f2b9..ed71f44

This rolls back to commit 396f2b9e82c242e959c542d235b4f148864f9e27.