Quick hack to get 1.7.8 support in.