Revert "Initial Matrix support by vpeter"

This reverts commit e7afa6a441386488e77e8e5aad76a463ef056f83.