Revert commit bb09f56 and add comment explaining.
Merge branch 'fix' into working