Revert "Fix logic flaw"
Revert "Fix logic flaw"

This reverts commit d6b916494d9de28aa03b582efcf246ffca4d3e06.

ConversationDevelopers/conversation,AndreasBackx/conversation,AndreasBackx/conversation,AndreasBackx/conversation,AndreasBackx/conversation,ConversationDevelopers/conversation,ConversationDevelopers/conversation,ConversationDevelopers/conversation