Reverted original Entity plugin behavior