Revert "Merge fix"

This reverts commit 817ff31f32917c39decfefc051016918e9aeb3f6.