revert last commit (needs more testing)