Revert 6dd73b3..6c7a977

This rolls back to commit 6dd73b356f2ab0e572086358a7ce2503a7079ea4.
Revert from #9 because of autoscroll issue