Revert "1746"

This reverts commit 3c2c8eead18cce78597ad79d0068778c63916a63.