Ported fix for removing manually scaled axes
Added parameterized instantiation