Support for gae <=1.7.4