[f21-branch][master][PATCH 1/2] Revert "Make Python's default encoding detection work on Live installations (#1169019)"