Fix messed-up merge. Sorry!

During the merge, one of the conflicting changes got lost due to my stupidity.
This commit should properly fix it.

Refs #108, #282