Closes #654 again.

#654