Removing the if statements around the builders for now.