Revert "#5288 - avoiding unncessary entitiy loading, using uuid instead in dao method...