This reverts commit 9f6a119c8aa276432ece4fe2118bd8a3c9b1067e.
Change-Id: I3ffafdab27cc4aca256c3a5806b630795b75d5c8
This speeds up certain workloads considerably, particularly those involved in buildling apps via the SDK. Windows-based use should particularly benefit from the change. Change-Id: I29f4b3a77400b201ee219729cc28a5e359c0c5e8