Revert 8004e82c50a8b090d099850b1b12381744da114d
We need to switch the paths over all at once, so we can't commit
this yet: leave it until scalar suypports the new API then we can
update develop to use the _matrix paths.
(Also for some reason I broke the IS path too)
