This reverts commit eca8b54a. Another user reverted the patch this was based on leaving this one in a broken state.