Revert "making cp1021 to cp1036 into 2gig aggregated machines"

This reverts commit e977da38a726307706a74bcb9065c48cf0da8858

Change-Id: Id7b1b063c5427f5c59ec8b989e70a7cb79f4f394