Revert not so well built concerns #127