Revert "Partial fix to S769 Launchpad bug 918418"