reopen 174945 thanks Due to the breakage when attempting to fix this bug, the patch has been backed out.