Revert 727e289..8cd20db

This rolls back to commit 727e2891d3065f896991fed558fdb4ad67bc397a.