Revert a2aa644..b465900

This rolls back to commit a2aa6442a54009d956cf7440d89fdad51e2464df.
Revert "merged"

Conflicts:
	canvas.js