Pretty sure reverting this to the current rev until we get the PR in along with the one at line 1909 should make this mergeable.