Removed workaround.