john fix

This reverts commit fda671a7ccea6a1bb85275b0684d117c120397dd, reversing
changes made to c026ea8b2d2871a683c6f2ca1c202a7eb0cbf1a7.