Revert b54423d..dada71e

This rolls back to commit b54423da3ab35775a13a865dac611112ca3e2237.
Revert afba7db..7cf6f21

This rolls back to commit afba7dbc8292b8ec916ca401241da2296d50918a.
localization