Revert router portion of refactor due to Sinatra helper call context issue