revert 4bda62ec1aba3ed4df1e7758aa7bc0cc0dde8e01, refs #896