Revert "1244"

This reverts commit cf0d539410c33844b0a75891ee9cb646711ec133.