[Patch] Port from v7 stl_function clean-up

[Benjamin Kosnik]

Can you hold off on all porting from v7 until the versioning patch goes
into mainline? I expect this within the next 24 hrs.

Thanks for your cooperation.

-benjamin