This needs reviewing for 4.4 I am not sure if it is possible with all of the changes to library-go.
*** This bug has been marked as a duplicate of bug 1841162 ***