[BACKLOG-321] - Backing out changes until a better fix that does not involve changing publi apis is completed.
Merge pull request #1906 from jeffreythomas/dev

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