As bug 814634 has landed, we probably could get rid of the backward compatibility check?