Reverting. The conversation on issues to do with this patch was not done (Appy brought it to my attention). This reverts commit 6adce67572a502a067c74f78cf83683dda4d67e4.