Revert "Revert "Revert "Revert "Oscar""""

This reverts commit 3487d9bd0b345a0e9193a357220aa7a209e33f8e.