Reverting this change, which breaks 2.5+