This reverts commit d67961b0. Reason for revert: Fails 18 tests in dx/tests/run-all-tests Change-Id: I98db656689d6330ddf56a5661a49a19315b8b901