Revert "Commit of a mixed reset of this branch to hard reset master"

This reverts commit c6264c68a53dce0c6c0dc2bc405ada6374067132.