Created by: Yohn
The original pull request - #6481 got merged into master instead of the -wip branch credit goes to @pseidemann for coming up with this solution