Undo r199448, already implemented in r199426