Reverting the last 2 changes:
Merge branch 'trunk' of github.com:markgrover/hive into trunk