Revert some changes made in merge d4e0d30

The reverted files were unnecessarily different to contiki/master and might cause merge conflicts in future merges.