Revert "Fix #1489"

Reverts thebuggenie/thebuggenie#304