Revert c01037f..d9ec4cb

This rolls back to commit c01037f7a19c9fbbc6f6b9c28b58623aeeda412c.