I couldn't find an easy way around this new build-time dependency, unfortunately. It creates some new mass-rebuild chains...