This reverts commit 7fd5d4e30e. We need to un-revert this before pulling in https://github.com/bitcoin/bitcoin/pull/6616
7fd5d4e30e