Merge "Hmm, contrary to Deckard's assurances, this broke internally. Reverting."