rolls back latest merge from upstream

To fix the agent commenting bug
Merge branch 'hotfixes' of https://github.com/mbehrooz/always into hotfixes