Revert "Revert fd53fdc..2713e04"

This reverts commit b9deebb250da66812d8e9e22a435eb9794c8d003.

Conflicts:
	teststory