Revert "Issue #2854926 by xjm, borisson_, boaloysius: Remove unneeded control structures in ContentEntityBase"

This reverts commit ccc65da7.