This reverts commit 56de738d18e11c86169f0248b97b2854c37e35ce. This broke the aarch64 bot. Reverting on behalf of jarin.