This workaround is not longer needed.