Revert "First attempt at fixing #43"

Reverts brainly/hive#42