Remove another workaround