#718 - Fix acceptance test failing due to wrong merge.

There was a small mistake in 29e3b456e507eabfed856a3212cc16f5ee96da55, where it did not correctly
merge changes from 118794c4b73c6cca50004d01dbb9ea59a742837d. Acceptance tests failed because of
this.