[revert] previous LS change. mantis #4908

Change-Id: Id1308a612949b65cd60f5cb07c97fb2cdc36983e
Merge "[revert] previous LS change. mantis #4908" into unstable