Revert "Third time's a charm?"

This reverts commit a9997c4d89d66022d86532101a56366e4a81cf3f.