interim workaround for build break