This reverts commit 73fe802ded9054d2a9e18f83b163565ff425a9b3, reversing changes made to 13c9ec76aa.
13c9ec76aa