Revert cb2dc9b..ed9c65b

This rolls back to commit cb2dc9bd794a6f1125f78f4f7db4a860c933a50b.