Revert 3ccff2cfb