reverted bad override by merlin