Reverting API and simply "doing it right"