re-arrange to allow compatibility with kohana-s1-rest-oauth module