Revert of stax-ex changes (breaking TCK+other issues)