Revert "Fix and unit test"

This reverts commit 0bb32d3d7c8ad64fdbda397c08dd8c6620d4b70b.