Revert b7a997760a