I'm hoping this is fixed by a0e330b09a020be497e8857c6c7be3aec33ff1de