This reverts commit 9fbcf91b3c. Broke OfBorg's eval checks. :( See <9fbcf91b3c (commitcomment-47236552)>.
9fbcf91b3c
9fbcf91b3c (commitcomment-47236552)