Bug896623

WIP - I still need to get a patch landed upstream with abide for this to work.