Brandon: Revert to 8c848a38a0 (before java backend).