This reverts commit 372e76ee, reversing
changes made to e595d6c0.