Removed Scott's faulty logic change.