Revert 9e98d15..b2168bc

This rolls back to commit 9e98d15fe87ac966fb25b08a6387d062de21bf63.