This reverts commit 3c2203ae. The buildbots were quick to remind me that I had, in fact, missed a switch case. Oops.