Revert b9d22c6..122b862

This rolls back to commit b9d22c6340e39fcb8f1f9bef7329fb695489507d.