brings the build in line with core

/cc @dedoz