This crashed the linker before. I will try again. This reverts commit a9d5ccdf. Change-Id: Ic204f9564a1fba97fcbf29cb4dc5ade25a9ce864