* Entity: Revert previous patches. It was not a bug but a feature...