Revert #95
Merge pull request #125 from github/semi-transient-nspopovers

Revert #95