Revert both r121082 (which broke a bunch of constant pool stuff) and r125074 (which...