Revert "Attempt to fix via SO solution."

This reverts commit 8c4fad971e3040d52826f5f2ddf11a26ee10acf3.