Revert 6df79a2..77fbe6f

This rolls back to commit 6df79a2e1b7d5f5b65d7cd275d0c844ecf4fe8e5.
fixed stuff