Code for a workaround that is no longer necessary was copied from existing code. This removes that unnecessary code.