This workaround is not needed anymore
Upver