cmworkaround is not required anymore