Revert previous bad commit r11512