I have no idea if this is related to #1001, or works at all, but it seems less weird.