This reverts commit f85d5ad6, reversing
changes made to b8d70393.