Maintain backwards compatibility with 2.0.x