Revert "fix for merge"

This reverts commit 5d944b822704d38f5df15ef9549a3032719730ee.