Revert "Convert next 4 APPs to the new Matrix effects."
This reverts commit 39a0d81b7482f2925808d661e526aeaa980fb079.
Revert "Convert next 4 APPs to the new Matrix effects."
This reverts commit 39a0d81b7482f2925808d661e526aeaa980fb079.