Ack, but at least add a "TODO(neobrain): Confirm that this is a proper fix and not just masking symptoms" to the comment (or something like that).