Revert 705f164..23116b7

This rolls back to commit 705f16456f4cb8ab9ac9102c572b2fe014058fa3.