Revert "Merge remote-tracking branch 'dafzor/patch-1'"

This reverts commit 69fd0539d9bcc698845c43b589fff92591a7b522, reversing
changes made to 864a04b4921843ff0248c71822b5aeb38cb9f58a.