Revert "Issue #2854926 by xjm, borisson_, boaloysius: Remove unneeded control structures in ContentEntityBase" This reverts commit 5d30d716.