Revert "moinhat"

This reverts commit dd90917c7974fa9be35267fee47133ab9092d51c.