Partial backout of 99b9d0d9c

.. for regression in Canabalt