Reverse wrong change made with merge from commit 502403c.