This reverts commit 173b5116. That commit was applied incorrectly, and undid previous changes. That was clearly not intended.