Back to origins

Revert local changes to reduce difference with upstream.

IMHO, it is better to bother edk2 developers with that changes