Revert "MartinBarrene"

This reverts commit 8058e275fc4f8514947e9c01806eeadbb3e7cb27.