Revert to c31f898b0862c55610ea04f916dd22bbd9360265