Revert commit 9524ec7 as previously discussed.