Revert 672c20d79d828451fa01290e992ccff9e7343052