* Remove the two hooks introduced in r52082