Revert d87fe76..60d908a

This rolls back to commit d87fe766e351bf4136fd16ac6cfbee35a64f551e.