Still doesn't work but I'm going to revert