This reverts commit a5148b26. Reason for revert: test actually didn't run Change-Id: I859e20db6981b15f44b48b4e9625846f3161160a