Checklist

=========

[x] I have performed a self-review of my own code
[x] I have commented my code, particularly in hard-to-understand areas
[x] I have checked for similar issues and haven't found anything relevant.
[x] This is not a security issue (which should be reported here: https://circleci.com/security/)
[x] I have read Contribution Guidelines.

[ ] I am requesting a review from my own team as well as the owning team
[ ] I have a plan in place for the monitoring of the changes that I am making (this can include new monitors, logs to be aware of, etc...)