Removed more (what I THINK is) implementation specific code out of contrib.
Authored by: jwjoubert 2015-06-04
Parent: [r33385]
Child: [r33387]