Revert 'add mako definitions for S2W'