FWIW I actually liked the indent change that was put in the first place. If you look at the explanation in that commit, it makes sense why that indent change was done.
> * lisp/emacs-lisp/derived.el (define-derived-mode): Revert indent change.
One more time: please always include some kind of explanation when you
revert code. E.g. a bug# or something.
Stefan