Revert 7d43110..550cbd1

This rolls back to commit 7d43110588b73f78d6837ce0368d5ec325af6284.