Revert "Revert "5/2/2013 change""

This reverts commit afa070c0110d7b272ae2af71b603ef1798f5cdfe.