Follow up to 67d984413c9540074e4fe6aa033081a35cf192bc. Backport of 81963b37a92ef583b9f725f1a78dd2ca97c1ab95 from master
This behavior was removed in 67d984413c9540074e4fe6aa033081a35cf192bc but is needed to prevent a crash in formtools. Backport of a4c20ae85b40c49e28d1b2227208e4f00d7820df from master