Revert "Merge branch 'development' into json-reporter"

This reverts commit b71437b2c479d1f1fe103eddbe1efee04abd1690, reversing
changes made to 939715b857b4a435b8feacec3527dd338dec78cc.