Adding build matrix again. refs #3722