Please, revert this shortcut to reduce logical indirections.