The way it was being done before was the correct way, this commit d6285235cb actually broke it. So this reverts it back to the original method.
The way it was being done before was the correct way, this commit d6285235cb actually broke it. So this reverts it back to the original method.