Revert "Opps2"

This reverts commit 7d6326178ebc64fa9da2824591cde85920e99553.