Revert c83ade3..8e66617

This rolls back to commit c83ade3d04dda5b7e61d35c81de6025b74bd0e99.