removing now unused workaround