This isn't ideal; has it been reported to upstream?