Revert back to a19cc5e6f5a2b1c74891e383d5548bc0d4b6a69e

This reverts commit cfbe6b969ea227e886b911192d2cca42d99d75b1.