This reverts commit 58935741. The approach taken in this commit was sub-optimal and not consistent with what we do for other applets, so it needs to be re-thought.
