Reverting patch and reopening issue #16155, as patch breaks