Reworked with a more sane approach
Revert "Reworked with a more sane approach"

This reverts commit 8641a207b0ea43f0c3fed1466f0b55724826f21f.

Conflicts:
	10.js