Revert "_s: Update selectors to reflect the changes in 810e499. Fixes #288. "

This reverts commit 0ac069a0bf51ad72d6548550a213eeffa18d876e.