Revert 7bbded, the right fix was 54442