This reverts commit 0f36ac4e66. This revert was only done for testing and wasn't ment to be pushed.
0f36ac4e66