Temporarily change this to use the version before the watchfix was introduced