Followup da433140: remove an old workaround