HIP-915 fixing 2008-only stuff