#7 - Revert #6

6 made a mess!