Revert 3cc997a..c3d60a9

This rolls back to commit 3cc997ad518d88e21e86aece2fed3b24199d5e43.
trying to fix bugs