Revert 563e87f, added extra acceptance test. Fixes #570.