Move deprecated API back to deprecated
Move deprecated api back into new
Merge pull request #569 from switz/api

@lefnire => Move deprecated API back to deprecated