Revert fa94b5b..d27a369

This rolls back to commit fa94b5bdee29cd8e4d8a85bb170e399b4ed7ecf7.