Fixes#173: Revert of bcdfb0843a