Revert changes committed accidentally.

These changes were used to test the axis innermost property fix, and
should not have been committed.