Revert "Greg"

This reverts commit d52e43d1a55cc14b6a7dac76fa19663fca5b490a.