Another revert

This rolls back to commit a39f0334ce8af26d526ef418110e889cf6a62dec.