Revert "Resolve selector conflict."

This reverts commit 68bd05694b83cb7e22167db389bcc0ff0825b90c.