This reverts commit a4250a96.

This is not the cause of the nonexhaustive-match failure.