Revert d77f6a9..116cdbf

This rolls back to commit d77f6a9b2c6903c894a0fb1c78f432d170029f8b.