Revert "Fix configuration (Should work now :P)"

This reverts commit ff13bad6e702bf46e81eaca3981da52a8383860d.
Revert "Revert "Fix configuration (Should work now :P)""

This reverts commit 3f0aa1e10aa36b058f12e9bf2152e423c200e232.
Fix