This commit only: https://github.com/bitcoin/bitcoin/pull/9672/commits/891c5eeec2dbf295d14e8f888de02637367dd930