67ffad8cd2
A few of these were redundant, others could be converted to new matrix API. Part of T49450
A few of these were redundant, others could be converted to new matrix API. Part of T49450