Revert "[FIX] Next attempt to fix #745"

This reverts commit d3d183cfe0cecbf69d49eb1d5c2f8be4537d5d86.