DESCRIPTION

Partially revert b991db9d4412be76a4e1f3f92a0701e1e1cb27cd.

The commit introduced some API breaking changes. The old classes can be
marked as deprecated and removed in the next major release.

Change-Id: I938f56dee99700fbb68e0f0a876c9ac72ef5bd46
Reviewed-on: https://git.eclipse.org/r/16016
Tested-by: Brenden Conley
Reviewed-by: Kaylin Maxwell <Chasity xxx@xxx.xxx
IP-Clean: Kaylin Maxwell <Chasity xxx@xxx.xxx
Tested-by: Kaylin Maxwell <Chasity xxx@xxx.xxx


COMMENTS

author: Kaylin Maxwell
date: 2013-09-03 18:48:18.000000000

Change has been successfully cherry-picked as f73d04ce837b8b1072a16d4c5758c7804fbdb3d7

-------------------------------------
