Remove the automap/statbar hack properly this time!

Didn't fully remove the hack in commit
5236f8e927b35abe26e7c595befe6596f9c91785. Thanks to Jeff for pointing
this out.