Rolling back my "fix"