Hups, should leave the flag in for backward compatibility