This reverts commit 2183f98f5482096ead88e9d251c6283fca067174, reversing
changes made to b465634a55c2faa0e7e52142adfdd742a3797f54.