Revert those matrix changes until I can test them.