notice: put things back in their proper places - S-2406