This reverts commit 59307b67. Reason for revert: Original bug is fixed. Change-Id: Ie3c310192a9febbfc3233bb4b8394205fa118b84