This reverts commit 7a1df387. Reason for revert: Fixing original failure Change-Id: Iae0abe01212f72dd21fbd4dd79634e2a954049be