Revert "closes #430"

This reverts commit d0e75fbe531daf3d975986baa1b7bd9d53d7833b.