Revert "Revert "menotte?""

This reverts commit 3a4f0669b16be93dbbd73cb723a319418c1dcd55.