Ok it was already written in new api, so what is the purpose of this commit? Just a nice spring code cleaning. Closes #10941