Fix weird things from the merge
Revert "Fix weird things from the merge"

This reverts commit 3359eb2223f5cebedd7dcb7e50ff7186c668f2e7.
Merge remote-tracking branch 'origin/master'