Reverting last commit...

The latest "fix" destroyed more than it fixed :P