BUILD-429 A little less ambitious, please