MADS: Restore accidentally reverted code