Revert cb63603..12a7041

This rolls back to commit cb6360399d24fbc14566125583f3c0d6be079b66.