rollback part of #887