Reverted back to the key hack
Merge pull request #3012 from amarzavery/profiledoctor

Reverted back to the key hack