Revert a177985..cc93fa2

This rolls back to commit a17798517659a4b23e83d844f13997c6061c67af.