Back out to fix the patch, my mistake for test in wrong branch (tested in MC)
and I always thought that gnomehack is post-patch, which isn't and is in
pre-patch.