Issue #2031717 by Berdir, swentel, fago: Make entity module not required.