Revert 54f9f7c..b1e328e

This rolls back to commit 54f9f7cc81971d08af185918b205966f5e2d44bb.