Ref gh-240, deprecated/removed stuff for 1.9