reverted unwanted refactoring

Change-Id: Ic9938411e5ab452396b603db799a6c8869f64a8f