Yes, but I'd want it documented _why_ this is happening because the logic is misleading.

Also I want @shioyama to sign off on this approach first.