Revert 8776ada..edaa682

This rolls back to commit 8776ada47d113e179da2326d42f82a9977dea33d.