Revert "Auto-commit from Team Snoxy"

This reverts commit ba53591996f450c1ea0c1ef0ebd0d48c5b2c7d42.