Revert "2013-07-03  Sharath Kamath  <s.kamath@samsung.com>"

This reverts commit 5554ad66af978d75df1bedfa7c78f38f0b682561.

Signed-off-by: Sharath Kamath <s.kamath@samsung.com>
Revert "2013-06-28  Sharath Kamath  <s.kamath@samsung.com>"

This reverts commit a5b552d9f22d1855a932b4c947719174a35d27e2.

Signed-off-by: Sharath Kamath <s.kamath@samsung.com>