Revert commits related to delegate setting

This reverts the following commits:
- efc4f9948db0a89435627bde32d2232efc04d020 (modify delegate setting)
- bca811fc9618236c937d3945834d81201a7080ed (comment on the modification
that was made)
Merge pull request #253 from sibljon/master

Revert delegate setting related commits
Merge remote-tracking branch 'upstream/master'