This reverts commit 297b2b95ce01b7e6dd6754a8cb0cae75a22323a3, reversing
changes made to 1b96738a53ca3f233b6950bfc3177e04665170b6.