Revert "CON-1387: Removed some tracking from Oasis"

This reverts commit 18b5d0473eaa6ac038aa86771b86ff04ea787a8c.