Actually, I tweaked it a little because I merged #1439 first and it caused a conflict when I rebased, so I made it use spies instead, but the concept is the same. Your name is still on the commit, too.