revert the experimental changes

It won't work as great as I thought.