Revert "Fix for KW issue"

This reverts commit 0e94cb91e10480a66cbe2921c2967a336dc553c7.

Change-Id: Icbd6dd2dc1de5d62bd1496369bc06d45b187e01a
1 file changed