Revert "closes #992"

This reverts commit ed4b0461b9ce6559b90391768856c38abc6f89b4.