Given some love to our Buildr build to make it work with latest (1.4.21)