Revert 59ef6e6..535558f

This rolls back to commit 59ef6e6839828775034c430d51466e6037ac0f78.