acc9bbef6c
This reverts commit f76ea29772.
Reason for revert: The test now fails on ATP
Change-Id: Ic7bd89e61f4107338bbfaf63628646af427668d3