This reverts commit 8882b4fd989e0601c8a5706db471a9fa673b6931. This was a temporary measure, from a long time ago, which is no longer needed. Change-Id: Ia5a3fb5db9b7cd471585fb6ff6e286e600d694a2