Revert back changes that created a bug
Merge remote-tracking branch 'jackyb/hotfix'