Revert "closes #784"

This reverts commit 80a83b33813550a2fefdfe8922f3d9c9b980d089.
Revert 7f11229..547a902

This rolls back to commit 7f11229dcbdbf433dad234b8561440c09ea13a91.