MoH: Undo commit r416150 (1.8)