Revert "Let's see if it works..."

This reverts commit 23a72c33b13866006af0d5ed097f95d047fd5d77.
Maybe this will work better...