Commit 6335a5c2ba reverted a previous commit which made the changes being reverted here unecessary. This reverts commit 896eba55c5. Change-Id: I890a67513b35df7708f9fc33c0be3e879fdb9e0e
6335a5c2ba
896eba55c5