Revert "Revert "Revert "Oscar"""

This reverts commit 8145b0160dc940cd6b7578fcb1f6fcd059d5b571.