This reverts commit c8cba0bc. An unintended code change snuck into this (was supposed to just add tests).