Revert "Merga"

This reverts commit 5833ffb87f63f7d494de2894082f34de328940f3.