Fixed pull request

I talked to Stefan who helped me fix the problem. There are now no reverts, apologies again for the sloppiness.