Remove the monkey patching, this was an error and a horrible decision