It works on 2.1, too. [ci skip]