Removed deprecated workaround