move reviewed core APIs and SPIs back in place

done together with anatole and rsandtner