undo commit for BUG17207