Reverting what initially looked like a bug