Re-merge "Mark the current node instead of the whole line"
Re-merge "Mark the current node instead of the whole line"

This reverts commit c376abf9d13874af077f623ce5bb71e0d22c0e28 and fixes `grunt test`.

rvarshney/code-dot-org,dillia23/code-dot-org,rvarshney/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,rvarshney/code-dot-org,pickettd/code-dot-org,dillia23/code-dot-org,rvarshney/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,dillia23/code-dot-org,dillia23/code-dot-org,dillia23/code-dot-org,rvarshney/code-dot-org,dillia23/code-dot-org,dillia23/code-dot-org,rvarshney/code-dot-org,rvarshney/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,rvarshney/code-dot-org,pickettd/code-dot-org,dillia23/code-dot-org