Rollback both features and entity as unpatched -dev.