This reverts commit 1a0344d6. Reason for revert: Fixed the original problem. Change-Id: Ibf4ba05160048a3216e0cc49cc88519f73d00fa4