Checkout
icing
committed
on 18 Jul
cleanup after backport of change