Clean up after 2013.3-921-g9de115c (9de115c)

In particular, stop farm overview from crashing.