Revert "merge fix"

This reverts commit 929650cffd74afbda440d14027770fba4a023165.