Backout r28696 - there appears to be something wrong with these new functions when trying to build on eddie