Revert "Revert "whoops... NOT SILLY ENOUGH""

This reverts commit b768b3c848b68cf45a62a44f06eaed87578b9d06.