Revert " Thanks david"

This reverts commit 324026af4373f2adb6f2c778afeedf9ac2eb54de, reversing
changes made to 61c139368bae8dc3ad4d11bc18146909790b6474.