Removing unnecessary optimization, fixes #303
Skeleton for acceptance testing for #303