Revert f1b6caf..b4662a2

This rolls back to commit f1b6cafd7e0c87d918466b448d391952057cb5fc.