Is this still being used anywhere?  If so, can we get rid of it as part of this PR?