Revert "static function calls"

This reverts commit b2ad24453f2f43d3a385d8423840a583cfea9230.