RESTORE THE EMMETS!

Fixes #1091