revert a bit of last change - not ready to stop using assoc in runtime yet