Revert "changes made by John Lee"

This reverts commit 9bdd7d0221b421170d382b7b368a01a6ddd3b3a8.