Removing old workaround