Re-applied the build fix that is now in swcarpentry/bc master.