This reverts commit 2fe987e6. Broke the Android buildbots. Turns out a couple more tweaks are necessary to turn them back on.