Revert to 17a7ddb3a9592db796f2a18d0e1cad752cace114