Backed out changeset 9c8fbf297d51
Camilo did not land his patch that this depends on, my bad.