Revert 1853d5c..5a77779

This rolls back to commit 1853d5c3b887a27bd1b4ca774ba43eb0ac988a38.