Revert last commits

This reverts commit 262bd9addebf6692ca64dbb3897dff0307fa7d4a.