Revert 932652086c9ad601c92ef4aae250f9e0b6ad51a6.