Revert "Adaptive fix"

This reverts commit 502d026bf4da322ed8a3d776a79e377018f496c8.