Revert "#2116"

This reverts commit e697841e7229c210f05b190cadd1e6c7287f1475.