Removed old workaround.