
        Remove use of some other unstable features

7f975c3