Machine Axis Setups can be overriden, however, there was no explicit way to clear out the override once or if it is no longer desired.

A new option has been added to the Setup\Setup Machine Axes menu. F5-Clear Overrides has been added. It will present a window prompt with four button options, Close, Material, PCode and Both.