Remove some now unneeded code from my previous fix