Revert to 6fb3ddd9f448cd40391d94155801b3766559e260