Revert "Merge fix"

This reverts commit 8588badd1f6d907fe3ed1660604ecbfffb2dff81.