Revert "move some things around ocd"

This reverts commit f3a5a335678c665b6adf8c889e6d29e925fdbb62.