Revert "John's change"

This reverts commit e364b0d4233a8347719509714714931d33f43db1.