Updated patch, currently in use on my machine, byte compiles cleanly this 
time and appears to as expected.