Revert 6bcb6a2..8ec7a1a

This rolls back to commit 6bcb6a210db0519e6e19dd7acd9c1321f34eb32b.
class stuff to sync