Revert "Alan's second change"

This reverts commit b3a97b6bb03c8b6ee0bef9b5d51daefd6179c0ac.