Second attempt at fixing the secure access problem.
Merge pull request #448 from mithro/sauce-pull-fix-2

Second attempt at fixing the secure access problem.