Revert "Merge fix"

This reverts commit c8542de2ac5a83895965e4c338d0a395eda10768.