Reverting commit b102d69ef9a7b5310602773b0be2d4ea3032dce0 due to the bug being a duplicate and the correct fix being different.