Revert "Changes From Work"

This reverts commit 6eeb5ba6e3001dd23260c482b811ca8b285d998c.