This reverts commit 7bd410c3c23067fcef2c6671676c104fbb8e974a.
Reverts D2999
After backporting PR10126 and then looking into PR10133 (https://github.com/bitcoin/bitcoin/pull/10133/files) it's clear that we've already backported up to this point and that re-implementing PR10126 is a step backwards.