Reverted fz specific changes.