[BACKLOG-321] - Backing out changes until a better fix that does not inv...

...olve changing publi apis is completed.