One would expect this change to be simple, but it apparently requires three commits