Revert "5656"

This reverts commit dc418f0ba3e741468fdb468cb0a1f4848251bc77.