Revert 1853d5c..0dc1e93

This rolls back to commit 1853d5c3b887a27bd1b4ca774ba43eb0ac988a38.