Revert 4d16a54..9f16066

This rolls back to commit 4d16a54122b35e1dfc4e38d3c40571b68f21ee30.