Revert "Feature/bugs bunny"
Merge pull request #1363 from onepercentclub/revert-1354-feature/bugs-bunny

Revert "Feature/bugs bunny"