Removed uber-brain-damaged code.