r7024: reverting mistaken commit