This reverts commit db188adf. Breaks the GCC tests, likely because of some order of evaluation difference between clang and gcc.