Revert half of the fix, as this part may have been unnecessary (related to issue...