This workaround is no longer required.