This reverts commit 98c38e34. Fixed by commit 3de87b847fa94cce9beaf5b225404c1bc7ec475f. Change-Id: If38f1e67dd8504055236bb8a9703d8c2eb61d16c