Revert "Fixed bug#9959 - & breaks ExpandCustomerName."

This reverts commit fc6dbbc1439cf9bfa86357de0b6b3218b3ddc0fc.

Conflicts:
	CHANGES.md