This reverts commit 06d70b021cb7db998b37657d033c5e34c116dfda, reversing changes made to 9a1c273c73.
9a1c273c73