Revert "Merge Fix"

This reverts commit 5e442fcf883d3fe01c070f0419f84cc1d56be194.