Revert dc6f7fb..dd36a0f

This rolls back to commit dc6f7fbe3d469d5cd8cc90afc83af93e10ab2c47.