Put back what was lost and remove duplicates.

This should fix the broken teaspoon test on master.

I'm going to recommend to the rest of the unbelievers that we should be rebasing our feature branches on master rather than merging master in to avoid this stuff in the future.