Revert "refs #209 Add a test for the issue and implement the fix. We just need"

This reverts commit b9dec354b8f9878d4813d76982e66dc474a78d5c.