Revert "Merge fix"

This reverts commit 85876edf09a0e5441bee0c5aaefaa9da744ac97c.