re #919 - Revert
Merge branch 'feature/919-hours' into staging