This reverts commit 0c25e7fd34. The slightly decreased evaluation time isn't worth the added maintenance burden
0c25e7fd34
deploy