Back out fix for #323. Fixes #324.