This reverts commit b1bf64d5. Since the root cause of #1143 has been fixed. Change-Id: I067de02a0d8843e496613559adea126fc218d4dd