Revert back to 6646fcaa (stubify etc will be in separate repo)