Caused some edge case build failures. Will investigate. This reverts commit 3771a653. Change-Id: Ieb4dc7cba1a54557181ca2184b51de954f51d05c