This is KIJI-401. I'll change the '// Oh well...' to a TODO referencing this issue.