a774765686
Merge commit 'd35498f6062410e777d6ad41a720db32336e2089' * commit 'd35498f6062410e777d6ad41a720db32336e2089': Remove some obsolete code.