block this fix from the 1.2 branch; proper fix will go here and is much more complex