This reverts commit d95cd811. Re-land the original patch now that the bug this exposed in selection has been fixed by 6bc64e24