Revert "Extend the build matrix"
Revert "Extend the build matrix"

This reverts commit be7cdf7e609ca9dfdab5aa393494fe545b60ffe8.

SoftInstigate/restheart,SoftInstigate/restheart,SoftInstigate/restheart,SoftInstigate/restheart