Looks like in 4.7 p3 our old functions are back. I did add an answer though for how to do it in 4.7p2