Revert 4410567..76d921f

This rolls back to commit 44105671d849d36b875099b6b216757cbafbd1e2.