Revert 588dc20..951c21d

This rolls back to commit 588dc20d2d57615e6581b01e91058f43690a0018.