3e25c8ac69 was an incomplete merge of the pull request. Thanks to @ramast for catching this.
3e25c8ac69