REMOVE ME test patch for Werner's new build hack