Have to be careful not break this in 1.18wmf1 branch.
Yeah, this needs to be reverted in 1.18wmf1 for deployment.
Oops missed that one. Well done Nikerabbit.