Reverting latest commit, took me a while to figure this one out.