revert performance for example's sake
merge resolved