Revert "699f86c535cbc01589d60ea1dc48114a93cd4f19"

This reverts commit a25624b99d5d329f6a010a4241e43bd1ec0cf016.