Simplify Manik's fix for MB-12346.