Revert edc27b9..deb488f

This rolls back to commit edc27b95bd02f4bb7e129d9647ee70382f870cdd.