Reverting c/p behavior, misread comments.