Lion, Application Expose, and Spaces

Is there a way in Lion to make only windows in the current space show up in application expose? If I have a Safari window open in Desktop 1 and a separate Safari window in Desktop 2, invoking application expose in Desktop 2 will show the Safari window from Desktop 1. I only want the window in Desktop 2 to appear.

There was a terminal command to do this under Snow Leopard (http://hints.macworld.com/article.php?story=20090930071112438) but it doesn't seem to work in Lion.

Thanks.