Revert "\#663399Becca"

This reverts commit e64180363ff3cb0939642431ea946a1a56855000.