This change backs out the 'misconception' fix of 76e6dba2 and reimplements it in a way that actually seems to work.
