Revert "Merge branch 'master' into issue/initial"

This reverts commit 9480f353c37a8f2ecd6bafd7283cf85e280b0a28, reversing
changes made to 8c6f6df79c0824b0cd1e2205244ffe45e1da857b.