Revert "Merge branch 'master' into Monk-Path-Work"

This reverts commit 968089a71f0e1b290bba3e6e63b6126d849bee4e, reversing
changes made to 9ae5e38ce50fdf79f3c84552c8dc0cacb2c7d69a.