This is a tentative quick fix. I was adding the same functions for both #14426 and #14427 and they were in conflict.