follow up to 8d2f5b4c - 2.6 compat