Revert "OCD"

This reverts commit 9554ea49231fc76c036e453980a57ded5a62cef9.