Revert "ForkFix"

This reverts commit 4688c6962faf2d015fe6412d4cb5a57f3443beba.
Merge remote-tracking branch 'origin/master' into Trafficlights