This reverts commit 7c3603e1. Turns out when you ask for "clang" it also uses the GCC Builder class, so I need to update some tests.