Revert "Merge branch 'cbrunos-bugfix'. Closes #419."

This reverts commit 3bf9b65e4f5ac2e1075ffe040530751acaf4f7a4, reversing
changes made to 7c805f39a99c986e719ba5a48d7a912b3d541dc5.