revert the use of emitter tokens for now