Revert 6c268ba..1f5c329

This rolls back to commit 6c268ba98ae71df9e785d3255e1bdede37eb3f23.
Revert "test"

Conflicts:
	extension.xml