Revert maplist fix