Is it possible (parts of) #108 are back? Specifically, this seems to happening again with b4cfc3fe and my #773 on top (which should be entirely unrelated).