* Entity: Revert previous patches...