Revert d8bb7f6..6df79a2

This rolls back to commit d8bb7f687b2642ed6dfdf338e84539875fffc0bf.