Why this comment line? You're supposed to be fixing 3141 here, and saying that this fix creates the same complications in what you're trying to fix?