Revert "Merge with mat's branch"

This reverts commit f38135f54d399569fd82fda34e9a7435a3d06f36.